Merge changes from topic "c2inputsurface-1-2nd" into main am: 7e548ec4 am: 1b5f9418

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



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