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

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

Change-Id: I5928f148bbb8e2d5aecc978df909d40741439d10