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

Merge "[automerger skipped] Disallow overlays for ResolverActivity am: 978809e4 am: 157dea0c -s ours am: 99338cc8 -s ours am: 28647a85 -s ours am: 0c082076 -s ours" into sc-v2-dev-plus-aosp am: b56ac844 -s ours

am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 718c60be is already in history

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

Change-Id: Ia89eb2a0adb27a67093576e0d48a8bba74336f28