Merge "Merge "Use more inclusive terms inside GraphicsEnvironment." into rvc-dev-plus-aosp am: adda6254 am: 057d3ace am: e5133fac"