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: f98e38f5 am: e101ea98

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



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