[automerger skipped] Add hashes for AIDL APIs am: 1dd5147b am: 7efab9d4 -s ours am: 3d500f5e -s ours
am skip reason: Change-Id I7ed581a6f673dc25210fd6a0628a712dbe1ab944 with SHA-1 f8f98958 is in history
Change-Id: Ib6e70fe991d83bc31fcc17fd3761d1517043c67b