Merge "Keystore 2.0 legacy Keystore: Cleanup when app/user removed." into sc-dev am: d76e8e1c98

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

Change-Id: Id4d7cc73597f4eef83bc09ffd26aedfadf2eadb2