[automerger skipped] Merge "DO NOT MERGE Suppress notifications when device...

[automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-qpr1-dev am: 06439d08 -s ours am: 6fb87bd8 -s ours am: 4b21d21a -s ours

am skip reason: subject contains skip directive

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



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