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

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

Change-Id: I1dcd71fb4bea0034d2e6e0e4047bd4496ee80975