[automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 -s ours am: 893ce3e09c -s ours am: 80a149a827 -s ours am: 7815edd7e8 -s ours

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

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

Change-Id: I3078800ee813a2cf106ed8b5ce7de0574205e357