Merge "Clean up safe_mode_config flag check in the functional code" into main am: 642e90e95b

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

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