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: 7a1bde29

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

Change-Id: I0862abcbf0c8adf4c808317a3faffc9e171b628d