Merge "Fixed subscription database cache out of sync" into udc-qpr-dev am:...

Merge "Fixed subscription database cache out of sync" into udc-qpr-dev am: 880cb61a am: cf0e8c8f

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



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