Merge "Auto selected sub should never be actual default sub" into main am: 2752add9

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



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