[automerger skipped] Merge "Clean up safe_mode_config flag check in the...

[automerger skipped] Merge "Clean up safe_mode_config flag check in the functional code" into main am: 642e90e9 am: 2bfd49b2 -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>