[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 skip reason: subject contains skip directive

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



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