Merge changes from topic "wifi_transport_info_stage_1" am: e126101fe6 am: 58c94eda42

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idec02d9238d199c451ef6522670ba0595b39ef8c