[automerger skipped] Merge "NIAP: remove keystore related code for now." into...
[automerger skipped] Merge "NIAP: remove keystore related code for now." into rvc-dev am: 2b00aa70 -s ours
am skip reason: Change-Id I642078f11cdb858a739abe4ad69c36060ad0f99c with SHA-1 4cf3717c is in history
Change-Id: Ib4b8712c971eb8969df5e6d51fac78476ad5dd71