Merge "Use more inclusive terms inside GraphicsEnvironment." into rvc-dev-plus-aosp am: adda6254d8 am: 057d3ace10 am: e5133fac3a

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

Change-Id: Ia1bfa28ad6254ac2b36f8037e2480903022bc632