[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: d93fd9dd -s ours am: 3020cc38 -s ours am: ae047938 -s ours am: 62a02309 -s ours am: 6728cfa7 -s ours am: 7f53a79a -s ours

am skip reason: subject contains skip directive

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



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