Android S Beta 2 (SPB2.210513.007)
Keystore 2.0: Remove references to Keystore1

Bug: 171305684
Test: N/A
Change-Id: I168d9a9e3ad41eba7ec0c8d7e5e3c5b03cb48efa
1 file changed