[automerger skipped] Merge "Disallow overlays for ResolverActivity" into...

[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: c153e0ef -s ours

am skip reason: skipped by user joshtrask

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

Change-Id: I8545b7d0c47ec33edd5bf56ace04421da64830b0