Merge "Use layout parameters to determine lock icon location" into sc-dev am: d20a486d am: 51e68e2a am: 84196d45 am: 6212b52e

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

Change-Id: I3eb6bb7dea5692208b62a3f32fba7f2ee5bb3c3a