tree 24860359b4446addc5bd32db653c36139fa92409
parent bbad7cee9c8b61444c78b1c611b29e83e3915fef
parent 85f6ce8e7157eb4c38d7a9cc934a9b35de11861d
author TreeHugger Robot <treehugger-gerrit@google.com> 1607374483 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607374483 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e am: 2aa9a43701 -s ours am: a9892de23f am: 85f6ce8e71

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17f588dc8bcd527b9f43492bc6437ac3d7dbff7f