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

Change-Id: I5b0808f926c4506e4ed0ebe1f06f80744415c6ef