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

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

Change-Id: I48da9b6b3de982acea6983e3c98fc7732caee710