[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: 1f788888 -s ours am: 1693b424 -s ours am: f656ca51 -s ours

am skip reason: Merged-In I8a0ab8952454652048076a26e81097b95991ae60 with SHA-1 2589a7e8 is already in history

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



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