Merge "Merge "Use layout parameters to determine lock icon location" into sc-dev am: d20a486d am: 51e68e2a am: f8060c15" into sc-v2-dev-plus-aosp am: a72bd108

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

Change-Id: I157b34ee9478698b0ae41f38f226b3857b2b4e9e