Merge "Use UnlockMethodCache#canSkipBouncer in user switcher" into qt-dev am: 57e8d83cab
am: 3963e204bb

Change-Id: I120151ebf2837cae579c80f78e6431633d6bcb17