[automerger skipped] Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." into mainline-prod am: 21f28e69e1 -s ours am: c6a4ff2641 -s ours
am skip reason: skip tag Change-Id I3303bb14516f07a55d82a16b59c111ab3f8b0389 with SHA-1 8fdfd46218 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14049945
Change-Id: I7eaa3076e3e2d3c65703414d6447b5481a9e1756
This commit is contained in: