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

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



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