Merge changes from topics 'hidl-register-fail-gracefully', 'anqp_hidl', 'supplicant_p2p'
am: 4a66dfba7b

Change-Id: Ib1ae2db51e18b935ee7f4cd105ca15bc2b9f0c8e