Merge "KeyStorage: rework key upgrade handling" am: d5de2f22b7 am: 689b4e7110 am: fff8a16d21

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

Change-Id: I8ce7002ba015f39bd5b925c987056805e86f9d3b