Merge "Keystore 2.0: Sensitive data annotation." am: 8ec84b332b

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

Change-Id: I2169bac0fbe1ad292cadf688480279ce6afbaea6