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

Change-Id: I3473f2d4c579a4dd6a3acec4bdb3dab0a6b122a7