[automerger skipped] Merge "Stop using CannotDeliverBroadcastException" into tm-qpr-dev am: 8ee0c719 am: 678ce49f -s ours

am skip reason: Merged-In I93aabe99167105111f9f3bd945cf4977cfb8cdb1 with SHA-1 3dc5a4b1 is already in history

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



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