[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: 7dacb9fb -s ours am: 241c81a6 -s ours am: 7d542726 -s ours

am skip reason: skipped by user joshtrask

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

Change-Id: I4ad826957bded28c5dd626f2f4bf494ccd38b38b