Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." am: 51bf93a35a am: f8a276f313

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fbbcbf584778a03d9844623a18966f4a775d1e5