Merge "Keystore 2.0: Update to canonical service name." am: 5fdf93fc9d am: 615236ca66 am: d99097637f am: dffcfd90c9 am: 0bc15d3205
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649648 Change-Id: Ibc08157b11b2a6564a76a53231b91876d4ad28d1
This commit is contained in: