Merge "Don't update lock icon location based on rotation" into sc-dev am:...

Merge "Don't update lock icon location based on rotation" into sc-dev am: e9a03ecd am: e07f8726 am: 47a055af

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

Change-Id: Ie0e9a2d56ba3115387f85d5260ba1bf19802a297