tree ff8c29c752777e9ffe92422c2f4e192a418b80e9
parent 613b0df6c9cc3553dbbb1e4ddbda729b57d7ffb9
parent 2bfd49b2f0e7136ae5b4f7f57d86d7e8f901bf59
author Yan Yan <evitayan@google.com> 1733184758 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1733184758 +0000

[automerger skipped] Merge "Clean up safe_mode_config flag check in the functional code" into main am: 642e90e95b am: 2bfd49b2f0 -s ours

am skip reason: skipped by evitayan

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

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