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

Change-Id: I6420540c867f0cf7e1c2aec5a33df60166680ddf