Merge "[automerger skipped] Disallow overlays for ResolverActivity am: 718c60bea7 -s ours am: 4f30365204 -s ours am: f34f93b815 -s ours am: 723262b3f8 -s ours" into sc-v2-dev-plus-aosp am: 98c3c79a91 -s ours
am skip reason: Merged-In Ied05088a5007e0f10cd3e1abd8d7da8ffeb3b674 with SHA-1 978809e428 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15956277
Change-Id: I22bb28424247c2b0c3b1bf9067dd3c88544ec36a
This commit is contained in: