Merge "Use source for keystore/keymint interfaces." am: 8d79d2824c

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

Change-Id: I20042d327151ef154fc8d431f3ff00b5e02dec10