Merge "Fix the dm-verity Merkle tree caches to not expire so quickly" into...

Merge "Fix the dm-verity Merkle tree caches to not expire so quickly" into main am: 6dc0ed17 am: a3ce6643

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3377529



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