tree 6c8821772477c3a014284457085582684b983cdb
parent abc0fd6965195515d1f0adb024aa5eb33435a79a
parent aeecad4897ff8128ccd9bade0a6bc0b2bf7f4555
author Victor Berchet <berchet@google.com> 1651536061 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651536061 +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: 4fea97557a -s ours am: aeecad4897 -s ours

am skip reason: subject contains skip directive

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

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