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

Merge "[automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98 am: 1ca6f8dd -s ours am: 764c1ec9 -s ours am: 58303167 -s ours am: 0d3014b9 -s ours am: b760217e -s ours am: d1f6b85b -s ours am: ca416a4b -s ours" into tm-d1-dev-plus-aosp am: 7a35d958

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



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