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

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



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