[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "ENFORCE_SUBSCRIPTION_USER_ASSOCIATION", "sim_state_string" am: 2910df87 am: c7aee822 am: 65b9fdbb -s ours

am skip reason: Merged-In I12bb0f34042529b76d0953ed51163e8efd1f498f with SHA-1 2f9cdb48 is already in history

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



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