Merge "Keystore 2.0: Implement unique id rotation on factory reset." am: 0b0d11f8ea

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

Change-Id: I63c16c42e236c4f15c0473666ed4366df423173d