Merge changes from topic "cherrypicker-L37600000962443954:N56900001394685860" into udc-mainline-prod

* changes:
  Add test for WifiNanIfaceAidlImpl
  Wifi-Aware: Add synchronous response true for bootstrapping and pairing APIs