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

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

Change-Id: Ie18a3661dd7459c744799d9490da2a766f37da4e