[automerger skipped] Merge "apk-in-apex-cache 1/n: Fix isCacheUpToDate for...

[automerger skipped] Merge "apk-in-apex-cache 1/n: Fix isCacheUpToDate for apk-in-apex" into tm-dev am: 239f082d am: ef2f1e4e -s ours

am skip reason: Merged-In I8a0ab8952454652048076a26e81097b95991ae60 with SHA-1 61cb9ddf is already in history

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



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