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

[automerger skipped] Fixed subscription database cache out of sync am: 19b8c17a -s ours am: 2b6a99f3 -s ours am: e5d4fea6 -s ours

am skip reason: Merged-In Iee0355a4069ce6d5c85ecc1bd727bc457c3bb902 with SHA-1 9b1054b1 is already in history

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



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