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: c2e1a34b am: a101c597

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

Change-Id: Ib8ad36bc9efba8ec345dd9b40aa68dc35a08d148