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

[automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into tm-dev am: 9ef08a26 am: ae4f4668 am: 38d41719 -s ours

am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 02771b7f is already in history

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



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