Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe am: 22298bfb7a am: d89a8edb77 am: 8ecdbfaafa

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

Change-Id: I80cba3d6eca00c23f158563209de1f288d152f82