Merge "[Wifi] Update language to comply with Android’s inclusive language guidance" am: 5be65d0810 am: 838b971cc4 am: e790db3aab

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

Change-Id: Ia82462a731e19ef1c0e279d665f73c3e538468fa