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

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

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



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