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

[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: f2b1582e -s ours am: 1d7d6ec5 -s ours am: bb5620a0 -s ours am: ed46f3e3 -s ours am: cdb65251 -s ours am: 11e9985b -s ours

am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc8 is already in history

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



Change-Id: I31805322fb36d4194197e64d437501d8fe9c282c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>