Merge changes from topic "wifi_transport_info_stage_1" am: 2e32af13c9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508601

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4298fe6bd7fa674780f07e604c3887aa5b012716
tree: 01dfa59835475170811f81e46340b0336454ba44
  1. framework/
  2. OsuLogin/
  3. OWNERS