Merge "Fix the failed case for the VtsHalWifiSupplicantV1_2Host#SupplicantStaIfaceHidlTest.RegisterCallback_1_2" am: 528f91b055 am: 3a8199998c
am: b9868f9988

Change-Id: I6f4faf1b515025ff096b1159dd69173c24e5e999