O-MR1: HIDL freeze-commit am: fe57f548e2
am: a8a198dd92

Change-Id: I017373895e279e79430dbec498494ac39cb7c9a5