Merge changes from topic "am-e99469bff1324e56a42a31403070d131"

* changes:
  Merge changes from topic "keystorebp" am: a12eab69d1 am: 315bbfc213 am: 2461194985
  Export AIDL for keystore Android.bp. am: 01478ec183 am: f179a478bf am: b5154d71b2  -s ours