Merge "Wrong subscription is getting cleared during slot switch" into udc-dev am: 4fbed237

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



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