[automerger skipped] Merge changes from topic "wifi_transport_info_stage_1" am: 2e32af13c9 am: 594a723567 am: f25231cff9 -s ours

am skip reason: skipped by user rpius

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1f60edc334e9361a85b8662cb4106d13e7f4493
tree: 822790a1fd54cf69da36871e6f031316097021f1
  1. framework/
  2. OsuLogin/
  3. OWNERS