Merge "libhidltransport: not in recovery"