Merge "Clean up flag safe_mode_timeout_config" into main am: de21a095 am: b597cb31

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



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