[automerger skipped] Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" into qt-dev am: 57e8d83cab am: 3963e204bb am: ab7ce8dd0e
am: ecb762bc44 -s ours
am skip reason: change_id Idbff4fbabca962c632ff5d78b25418c0502db9a7 with SHA1 e614797b48 is in history

Change-Id: I43a335794fb2556dc8c28277d8f6dda5733fb8d1