[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: e3dbcdf8 -s ours am: cbd635e6 -s ours am: 0bc547ae -s ours

am skip reason: subject contains skip directive

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



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