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

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

Change-Id: Ie1260a2ede9785584d497e9aa182e3e58c52af03