[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: a78e5a9d -s ours am: 5027b027 -s ours

am skip reason: subject contains skip directive

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



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