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