Merge "Keystore 2.0: Enable by default." am: a5e337b0b3

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

Change-Id: I89221d632a20d176b2aa358ce7b7a3749c85661d