[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc7 am: d4be3653 -s ours

am skip reason: skipped by user joshtrask

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

Change-Id: I3398972f2772e2a688d391b246bc9b121f7ea204