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

Change-Id: I2bfdccc0ac636af39eb9a2e852e69b008118afc3