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

[automerger skipped] Merge "Clean up flag fix_crash_on_getting_config_when_phone_is_gone" into main am: 67590c56 am: 09bf32b2 -s ours

am skip reason: Merged-In I6f5ba1998824c87ea458bf8163fdf9e6ba8a451d with SHA-1 1ad73f71 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/3263862



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