[automerger skipped] Merge "mainline_system: libhwbinder/libhidltransport" am: 2ce54fa76a am: a84540e557 am: 3b9d2dc689
am: c58858de4c -s ours
am skip reason: change_id Ia142f8e67c31f66f86386b65e009d4faee502c11 with SHA1 3dbd647da5 is in history

Change-Id: I6f8a20a23dc1df0dafd104d7fe0a08486879f7ec