Merge "Prevent NOT_ENOUGH_DATA from entering HIDL" into pi-dev
am: 79890542c0

Change-Id: I66baa73fd6b3d55e33850af41e46715a91f6f970