[automerger skipped] Merge "Keystore 2.0: Enable by default." into...

[automerger skipped] Merge "Keystore 2.0: Enable by default." into rvc-qpr-dev-plus-aosp am: 58710e9a -s ours

am skip reason: skip tag Change-Id I13a3db8ca736cceb06e864457046ff9ca641322d with SHA-1 7aa8d2aa is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13913584

Change-Id: Ie2e51a6f5821bf72d482845d040c9d5a678b2b56