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

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

Change-Id: Ib933b4ce6dc3f8e916021501ce22f1a811097801