Merge "Fix issue of indication area over top of customize lockscreen button"...

Merge "Fix issue of indication area over top of customize lockscreen button" into udc-qpr-dev am: fba608d8 am: b92b4425

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



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