Merge "PIN/PUK Views not showing after boot" into sc-dev am: a701830c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13815463

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b9a8df4a327fd0d49d22b2536cb6a6399469a6b