[automerger skipped] Merge "Use source for keystore/keymint interfaces." am:...

[automerger skipped] Merge "Use source for keystore/keymint interfaces." am: 8d79d282 am: 4ea150e1 am: 1dd19c49 -s ours

am skip reason: skip tag Change-Id Ia7fc2403cfe6dece86ed0ab9d6f415be2a2726b8 with SHA-1 2390267d is already in history

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

Change-Id: Ie4ca6eba187dff70779fc0666cf680d9f95107d8