Merge "Fix bug with deferred commits for key upgrades in temporary directories" am: 54ebfb5806 am: 38c07b96a1 am: a387eda4d4 am: a1837ca9fe

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1706645

Change-Id: Ib58f5ff7a09d6a9c9a1008c05fc7d7df5d736a5b