Merge changes from topic "wifi_transport_info_stage_1" am: 2e32af13c9 am: 594a723567

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idec02d9238d199c451ef6522670ba0595b39ef8c
tree: 205467b135d200594b86d70a00824921a1bd3cae
  1. framework/
  2. OsuLogin/
  3. OWNERS