Merge "Merge "Remove IntentResolverInterceptor" into tm-dev am: 12981661 am:...

Merge "Merge "Remove IntentResolverInterceptor" into tm-dev am: 12981661 am: 2866662e" into tm-d1-dev-plus-aosp am: ed5c96a0

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



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