Merge "allow KeyguardIndicationController to be more easily overriden" into rvc-qpr-dev am: b1012032d3

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

Change-Id: I8114ca144e0981d3180d2fbca4bfb0920ac52281