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

Merge "[automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 52bd9bb5 -s ours am: 268fde53 -s ours am: 8f402a83 -s ours am: 6f42529d -s ours am: a8262e88 -s ours am: 8fca8bc9 -s ours" into tm-d1-dev-plus-aosp am: 3f35b4ec -s ours am: 540a0817 -s ours

am skip reason: subject contains skip directive

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



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