Merge changes from topic "wifi_transport_info_stage_1" am: e126101fe6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4298fe6bd7fa674780f07e604c3887aa5b012716