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

Merge "Remove IntentResolverInterceptor" into tm-dev am: 12981661 am: a95c2647 am: fd5a089f am: eef8df7f

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



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