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

[automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2d -s ours am: 7f401aa8 -s ours am: 548bf8cc -s ours am: 203de0f0 -s ours am: b15df339 -s ours am: 4da2a453 -s ours am: 6c453ab3 -s ours

am skip reason: subject contains skip directive

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



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