Merge "capengine: fix structure due to deprecated input devices" into main am: a387a2cd

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



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