Merge "Set top and bottom of lock icon to be global rect." into udc-qpr-dev...

Merge "Set top and bottom of lock icon to be global rect." into udc-qpr-dev am: 8a820a9c am: 3a837678

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



Change-Id: I04cc2f0e0ffd417908fe6de49e42020f028c0471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>