Merge changes from topics "soong-inclusive-language",...

Merge changes from topics "soong-inclusive-language", "soong_inclusive_language2" into rvc-dev am: f4a5492e

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11859399

Change-Id: I8410a0a2d25a3798ab64f63a99673cf643caf931