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

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

Change-Id: Ife70ee6c3a6dd6c6ccab8562850a2add9ff14e63