Merge "ClientComposition test fix" am: a051311593

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

Change-Id: Ie1a165623f75c0067fdf71e53377d950bb922a2a