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

Change-Id: Iaa6e81c65f2c63a9076f3ad0f7424dd9fcef38c9