Merge "[automerger skipped] Disallow overlays for ResolverActivity am:...

Merge "[automerger skipped] Disallow overlays for ResolverActivity am: 718c60be -s ours am: 4f303652 -s ours am: f34f93b8 -s ours am: 723262b3 -s ours" into sc-v2-dev-plus-aosp am: 98c3c79a -s ours

am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 978809e4 is already in history

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

Change-Id: I22bb28424247c2b0c3b1bf9067dd3c88544ec36a