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

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

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