Merge "libhidltransport: not in recovery" am: cff26ef9dc am: 75c1be3b56
am: 00e036e1c5

Change-Id: If34ceddd4e6510a78d72d370a2061104ed9f4471