[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays...

[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a9151997 am: 2aa9a437 -s ours am: a9892de2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65d77c3c623f4c4ee099e0814db1d30cda2af6dd