[automerger skipped] Merge "Clean up flag...

[automerger skipped] Merge "Clean up flag fix_crash_on_getting_config_when_phone_is_gone" into main am: 98248bd3 am: ffea0308 -s ours

am skip reason: Merged-In I8d02430b70c1ed432826e02bc5938c6772ff1f95 with SHA-1 367a4c3d is already in history

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



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