[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc7 am: d4be3653 -s ours am: e3d406ab -s ours am: 6071b119 -s ours am: 63c01046 -s ours am: 80de4b8d -s ours am: c87b5ceb -s ours am: 0a90e5c7 -s ours

am skip reason: skipped by user joshtrask

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

Change-Id: I219e3663ffed98ee8b7c2301a62f0ac31b9505d6