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

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

Change-Id: Ibccd82b97a3baf95aee0407eedc6da428237e2ca