Merge changes from topic "hidl_for_test_aosp"
am: a7603c38ac

Change-Id: I92acd703df3ed100255e63c9ec511eec3c0a97a3