Merge "Keystore 2.0: Make key blob upgrade atomic." am: 70761c104f

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1502131

Change-Id: I39ca648c62ee62938b036f2d7fe61b73ea8bb12d