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 am: f699110e

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

Change-Id: I04069cb92f7b5d6b2bcd4f42391107e0955fcf5e