Merge "Wrong subscription is getting cleared during slot switch" into udc-dev...

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

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



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