[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: c8aacc1e -s ours am: df0be7a9 -s ours am: 70ab572c -s ours

am skip reason: skipped by user joshtrask

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

Change-Id: Ie88fee24d56597c9c96f814ed371df796d73620f