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

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

Change-Id: I1f0e2a9e01faee759a24f5ee48d43de4b373c44b