Merge "c2: set c2inputsurface to -1" into main am: 3c2d4fa727 am: b9eae21304

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/2975213

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