[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours am: 241c81a614 -s ours
am skip reason: skipped by user joshtrask Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137 Change-Id: Iec2e808c5f377429378e4f1d6dd4fb0a7f15cdf1
This commit is contained in: