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

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

Change-Id: Iff94a433e6402214347c90651cd131e8ddd509ce