Merge "hidl_test: update expression test"