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

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

Change-Id: I67dc8c73d5362b1bf5600fe612148f0ccc918179