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