Canonicalize keystore2 service name. am: 847843acfe am: ad6ec4fbba

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/1649708

Change-Id: I3d58eb79b8cd62e1b90ff12ade1245938140e9fe