[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

Change-Id: Idcb1a917bc0388248671d7fcd155a5319ebf94cc