Merge changes from topic "hidl_for_test_aosp" am: a7603c38ac am: f78db71dae am: e9b22b6133
am: 7f344d6a66

Change-Id: Id820cbc9706c2427b3f63d5e5a25e68f86767af5