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: 0b401645

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



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