am aa7a646e: Merge "Generate IKeystoreService using aidl"

* commit 'aa7a646eebb9b22d1421f8b09a09669bdb10d8b7':
  Generate IKeystoreService using aidl