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

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

Change-Id: I47bcf7297981c55f4a90dbbdd6c82de197196691