[automerger skipped] Merge "Fix ordering of cache files requirements from...

[automerger skipped] Merge "Fix ordering of cache files requirements from device" am: dc46322e am: a43ffc12 -s ours

am skip reason: Merged-In I0d95b2d436994ffc877a4e02eb31f449b983e61e with SHA-1 3fd4ec47 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1749647

Change-Id: Ifb72b158848012c32435ae6865ff4865a3c04721