Merge "Remove IntentResolverInterceptor" into tm-dev am: 1298166190

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

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