[automerger skipped] Fixed subscription database cache out of sync am: 78fc83e5 -s ours am: e21ad2d7 -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: Ia90ce8bc6e7919df16a4d771abde8d7975b434cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>