tree 7dee0645161b537ae79d4d8c3025612d25224459
parent 0bf89de5dab833ab455f8f32fff86f9881bcac81
parent f3890ebd99e3b474cf50933c7afe3199803735e3
author Bill Yi <byi@google.com> 1600502466 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600502466 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5e95ddcc17 am: a2e53b87fa -s ours am: 7740e236d0 -s ours am: f3890ebd99 -s ours

am skip reason: Change-Id I84c06c89ceb70b56c73632de31265095a7fbcb3c with SHA-1 04fa435cb1 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/1429919

Change-Id: I79c563b51672666ad5c16c2e89d8c2a4dda111a2