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

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



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