[automerger skipped] Disallow overlays for ResolverActivity am: 718c60be -s...

[automerger skipped] Disallow overlays for ResolverActivity am: 718c60be -s ours am: 4f303652 -s ours am: f34f93b8 -s ours

am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 34534e1f is already in history

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

Change-Id: I0eb16ea80f23d437d558b67bd3e291b7abfd0b57