Merge "composer3 frozen" am: e9d1bca6d7

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

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