Merge "Fix fatal exception in FakeBroadcastReceiver." into tm-qpr-dev am: 78f097ad am: 14ad4fac

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



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