[automerger skipped] Add hashes for AIDL APIs am: 1dd5147b am: 7efab9d4 am: 8a4d1175 am: 12ec6dfa -s ours
am skip reason: Change-Id I7ed581a6f673dc25210fd6a0628a712dbe1ab944 with SHA-1 f8f98958 is in history
Change-Id: I15c3c58ef15bd1b4954a2e851963dee35853d593