[automerger skipped] Disallow overlays for ResolverActivity am: 978809e428 am: 157dea0ce9 -s ours am: 99338cc865 -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: I2ccffdd80181b9783d69f52dc2ce84df9e79f620