[automerger skipped] Merge "composer3 frozen" am: e9d1bca6 am: f044e893 am: c3b6541e -s ours

am skip reason: Merged-In Iefdfe812fc9309a0a758eedb3da9d3676e956f02 with SHA-1 a2fbcab1 is already in history

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



Change-Id: I2130bfd93307eeff387bf848f6a8a2cd8b0ed573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>