[automerger skipped] Cherry-picked "Hide bouncer after unlocking SIM card" to pi-dev am: 2508afecc7
am: 8c21b496a7  -s ours

Change-Id: I60f4cff0df6520f689b5061a67805d6047013dc2