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

Change-Id: I130fb9c236238a5095a1a621592d346e9340f440