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

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

Change-Id: I7f760ebf5a59a63ea6ae3de7e043cb4d105cb624