Merge "Remove IntentResolver from build am: 42d97799 am: 5ead2126" into...

Merge "Remove IntentResolver from build am: 42d97799 am: 5ead2126" into tm-d1-dev-plus-aosp am: a3107e5c am: 48bc3457

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18576967



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