O-MR1: HIDL freeze-commit
am: a923c0f300

Change-Id: Ic4e6c95baa18a3328be1e09de30650ad883905d5