Merge "Use UnlockMethodCache#canSkipBouncer in user switcher"
am: 63e2a95b87

Change-Id: Iba7f5c6c12c1b0e5e0dd07fa9a20850428bd5674