Merge "Merge "Use layout parameters to determine lock icon location" into sc-dev am: d20a486dce am: 51e68e2a08 am: f8060c150b" into sc-v2-dev-plus-aosp am: a72bd108e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15482397 Change-Id: I157b34ee9478698b0ae41f38f226b3857b2b4e9e
This commit is contained in: