Merge "Use layout parameters to determine lock icon location" into sc-dev am:...

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

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

Change-Id: I3fc3461b505f62819c55d99521a4184092531906