[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications...

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

am skip reason: subject contains skip directive

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



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