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

Change-Id: I20a67ddb6a735d513e7fc1f303b3a8ef87c9d577