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

[automerger skipped] Disallow overlays for ResolverActivity am: 718c60be -s ours am: 4f303652 -s ours am: a912c1d7 -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: I9bc0895268e2916ca6c6c71a95c0135fc31e3823