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