Merge "Lock icon is a set distance from the bottom of display" into sc-dev am:...

Merge "Lock icon is a set distance from the bottom of display" into sc-dev am: 9470519d am: 1e047e1c

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

Change-Id: If95eebf6b61c4c3cd76b79d684b4a965ffffad68