Keystore 2.0: Clean up lints

Bug: 184833962
Test: m
Change-Id: Iff862198960003cd780844b0cd6620da941d48bc
5 files changed