[automerger skipped] Add hashes for AIDL APIs am: 3c9c456f am: 4e3949a3 am: eb31dbf5 am: 4dc7b178 -s ours
am skip reason: Change-Id I42ee68bcbb320ea2531144f81292675528b3038c with SHA-1 f67e0889 is in history
Change-Id: Ie038afa0fa2de04d6d1f7570b9b8dbbb92cbee40