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

Change-Id: I8d2ef62ab7bbcb9de7e6ac471f2da208422d7bbc