[automerger skipped] Merge "unique_fd is passed by value in AIDL interfaces" am: 6316f348e7 am: 7aa79697cd am: 57f0391e52 -s ours
am skip reason: Change-Id I2b87761401361f9cf96cdda070f26e70a5c6c935 with SHA-1 b8ba23418a is in history

Change-Id: Ic6cbba1664706f60e80341a574e3786fb2c481d9