[automerger skipped] Merge changes from topic "wifi_transport_info_stage_1" am: e126101fe6 am: 58c94eda42 am: 741b00a913 -s ours

am skip reason: Change-Id I215b769339f68b76a1b2fa15f66c4527d184b696 with SHA-1 80222a8079 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c79d56329da2544e3f0d8520a66b227e3b1e4b5