Merge "Remove ableist language" am: af72f11bd2 am: 6191fc04a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1957031

Change-Id: I923145918d022823af6e3b82bada8215aa10efba