Merge changes from topic "c2inputsurface-1" into main am: c620564b1c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3345706

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