Merge "Remove gendered language" am: 35616155b5

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

Change-Id: Id351aef2dc3869ab5fa0b4c909f367b64eead9b2