[automerger skipped] Merge "Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" into qt-dev am: 57e8d83cab am: 1ac62e687a" into qt-r1-dev-plus-aosp
am:8d0e14eac9-s ours am skip reason: change_id Idbff4fbabca962c632ff5d78b25418c0502db9a7 with SHA1d2eb34b689is in history Change-Id: I0fefebfc704e6d18a734dd486248a225f89d2bfe
This commit is contained in: