[automerger skipped] Merge "Fixed subscription database cache out of sync" into udc-d1-dev am: e4a0c7ad -s ours am: ca2f6b53 -s ours

am skip reason: Merged-In Ib818110a1f03536ed9082e779b3cc89e56608084 with SHA-1 7542cfca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24124071



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