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

[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98"" into qt-qpr1-dev am: f44dc5ce -s ours am: 938c647b -s ours am: 83b4fadc -s ours am: 4fea9755 -s ours am: aeecad48 -s ours am: bcf1533d -s ours am: c410410d -s ours am: 36db8e04 -s ours

am skip reason: subject contains skip directive

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



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