[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: 80de4b8d -s ours am: 0acc275d -s ours am: 1c617888 -s ours

am skip reason: skipped by user joshtrask

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

Change-Id: Iddefd9f1700ae35c2fa98b2d686608529292d41f