Merge changes from topic "hidl_for_test_aosp" am: a7603c38ac
am: f78db71dae

Change-Id: Ife8a39e423f3a3faa46841670899492bc4bc48ce