[automerger skipped] Merge "Merge "Update persist cache when package updated." am: a4a9679c am: 28008bf7 am: 150fe741" into udc-dev am: 3b947be2 am: 167d0375 -s ours

am skip reason: Merged-In I20f76b50b5f3cfe85ba633e74f098b8029d4ee14 with SHA-1 536184a9 is already in history

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



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