[automerger skipped] Disallow overlays for ResolverActivity am: 978809e4 -s...

[automerger skipped] Disallow overlays for ResolverActivity am: 978809e4 -s ours am: 893ce3e0 -s ours am: 80a149a8 -s ours am: 7815edd7 -s ours am: 095e53bb -s ours am: 3ec02f46 -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: I228c2882b45e157b6428f5da8177600ae6cc03ff