Merge "Update lock icon location if auth setup is delayed" into sc-qpr1-dev...

Merge "Update lock icon location if auth setup is delayed" into sc-qpr1-dev am: 001ec603 am: 201757af am: ae339bdc

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

Change-Id: Iec75ebc896d4a69270dc8dab059f94011d0b8ca0