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 am: 23bada6b

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

Change-Id: I37d02bc026fa49ab4e1badf72600d566270702f3