[automerger skipped] Merge "Clarify the ComposerClient comment for CONFIG_GROUP" am: f344363e64 am: 281a5870d0 am: ae48e3ae6f am: 5141f54b50 -s ours

am skip reason: Change-Id I2b09689825fc9564665324ff18eb1907765b9016 with SHA-1 657404c22c is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1497983

Change-Id: Id401ad985eb5dec4b25712d57242a72f9c4e1f97