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

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

Change-Id: I14b6c98f96480760e36ed46c060d6296ce508614