Merge "Replace screen broadcast receivers with binder cb" into tm-qpr-dev am: 17976479

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



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