Merge "Update graphics language to comply with Android’s inclusive language guidance" am: da4dc882af am: a97e560c61

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

Change-Id: I5d853a84c0fe1550d86d0f948f76e532af42e073