Merge "Prevent non-system overlays from showing over notification listener consent dialog" am: 2fc8e09eca

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

Change-Id: Ieebdacdcf9397418072a19c78c33179bc81cfa21