Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." am: 4346a646e3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81793b6c6ff3e4eb4146a115079443f76eecba13