tree 31fff07d98ad53e3566d7105404432a04241b28c
parent ae0479380ad6ae1f8dde8a4b3ae839d69d49ac8d
parent 83b4fadcb7666811327b654ebdc55035b6e4e4f8
author Victor Berchet <berchet@google.com> 1651532526 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651532526 +0000

[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours

am skip reason: subject contains skip directive

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

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