[automerger skipped] Merge "unique_fd is passed by value in AIDL interfaces"...
[automerger skipped] Merge "unique_fd is passed by value in AIDL interfaces" am: 92ef3ad3 am: 2a3219d6 am: 687a1929 -s ours
am skip reason: Change-Id Id0fead2717b1f6a3b9a1867efa8b588b59d3fbd2 with SHA-1 3b25ae15 is in history
Change-Id: Ia21c97efb6332a8c527807c600345f382cdacb4e