Merge "Merge "Update persist cache when package updated." am: a4a9679c am:...

Merge "Merge "Update persist cache when package updated." am: a4a9679c am: 28008bf7 am: 150fe741" into udc-dev am: 3b947be2

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



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