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

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

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



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