Merge "composer3 frozen" am: e9d1bca6d7 am: f044e893e4

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

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