Merge "Revert "Clarify the ComposerClient comment for CONFIG_GROUP"" into android12-tests-dev