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

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



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