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

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

Change-Id: I441e7684b9e35d168ef034456311e95c01e8b18b