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