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

Change-Id: I3b66cd3a9ef8790f7239951f74fd8143ed37c61b