Merge "Add Keystore 2.0 service." am: 0078542aa1

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1395708

Change-Id: I8b30f67ee5943ce28ac55928906bb9e93c657e04