Merge "Keystore 2.0: Update to canonical service name." am: 5fdf93fc9d am: 615236ca66

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

Change-Id: Ibb904c21a845199a7e66c592d5ab2c8e191c97f0