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

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

Change-Id: I7f00901f055431bc5ba7e5e490b05db030b61cbb