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: d188dc34 am: b2e53ed4

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

Change-Id: Ie63f73ab73563391083c3b0b7593a3a4e0a95c9a