Merge "Only ONE view controller controls KeyguardIndication" into udc-dev am:...

Merge "Only ONE view controller controls KeyguardIndication" into udc-dev am: 353d5f12 am: 7a115afc

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



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