[automerger skipped] Merge "allow KeyguardIndicationController to be more easily overriden" into rvc-qpr-dev am: b1012032d3 am: 8c2b879a3c -s ours
am skip reason: Change-Id Iccbeaa527014abc00107ea1165f93330d80c3791 with SHA-1 1463e18d20 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12153272
Change-Id: I0be4ce594309865545dd53f3a20a6b80d7b3c180
This commit is contained in: