am 461b8643: am 4c74d4ff: am 10d412aa: am d72d0954: Merge "Make hardware-backed RSA keystore a non-requirement for ATVs" into lmp-dev

* commit '461b8643943504094058add2e00e88027e06b499':
  Make hardware-backed RSA keystore a non-requirement for ATVs