[automerger skipped] Merge "[Wifi] Update language to comply with Android’s...

[automerger skipped] Merge "[Wifi] Update language to comply with Android’s inclusive language guidance" am: 5be65d08 am: 838b971c am: e790db3a am: d4842356 am: 2474b5d8 -s ours

am skip reason: Change-Id Ia9a9b84c4587885a1a20327cbdec0b26eba0ba40 with SHA-1 9486831d is in history

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

Change-Id: Ib6a9337a0afcc19511072569dd4a4be00ef6b738