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

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

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