Keystore 2.0: Update service name to canonical name.

Bug: 179907868
Test: N/A
Change-Id: Ia536a92d212f42af32ed485e19c82b84b0905dc8
2 files changed