Merge "[automerger skipped] Fixed subscription database cache out of sync am:...

Merge "[automerger skipped] Fixed subscription database cache out of sync am: 19b8c17a am: 25979025 -s ours" into udc-qpr-dev-plus-aosp am: bb4666d3 -s ours

am skip reason: Merged-In Iee0355a4069ce6d5c85ecc1bd727bc457c3bb902 with SHA-1 19b8c17a is already in history

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



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