[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 am: 85f6ce8e am: d6d4c2ac am: 7787e22d -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie16930e02e4035de7386f96704c7232317afee18