[automerger skipped] [conflict] DO NOT MERGE Suppress notifications when...

[automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98 am: 1ca6f8dd -s ours

am skip reason: subject contains skip directive

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



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