[automerger skipped] Merge "DO NOT MERGE Suppress notifications when device...

[automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev am: 4228c9bd -s ours

am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 52bd9bb5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17874414



Change-Id: I4399a5293675798602da8aedbbd63ddfc1d1dafc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>