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

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

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



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