Merge "hidl_test: update expression test" am: 9dc1284388 am: eed76d6fc9
am: 23072f6c52

Change-Id: I854241b90ba0c4002244cc0a2071aaa2d7ecfd7d