[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: 764c1ec9 -s ours am: 58303167 -s ours am: 0d3014b9 -s ours am: 7db35bb2 -s ours am: 534197a8 -s ours am: 47725cbf -s ours

am skip reason: subject contains skip directive

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



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