[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker"...

[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d -s ours am: a5715ed5 -s ours am: 04c2f0b1 -s ours am: 47c4492d -s ours am: 8ad7f62a -s ours am: ec2f5b30 -s ours am: aef00cff -s ours

am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835812

Change-Id: Ibbe4216c0cf3a95f5692ff847fc3c3497e8ca15a