Merge "Keystore 2.0: Remove hidden Keystore API from locksettings tests." am: 665844b1e2 am: a8781112be am: 5f2b63be5e

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

Change-Id: Ibd44148535bc5d02fc4b9a9f7d58cd32151829ce