Merge "Update lock icon location onConfigurationChange" into tm-dev am: 97bbf580 am: ad1648d9 am: 3f58bbf4

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



Change-Id: I021e9781c3ec8025b929681dc865988702337abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>