[automerger skipped] Merge "Remove Descriptor proxy field from individual...

[automerger skipped] Merge "Remove Descriptor proxy field from individual effect" am: 2ba43ea9 am: de3713b3 am: 505345b8 -s ours am: bee5eeb9 -s ours am: 03e63c22 -s ours am: cf26aea9 -s ours

am skip reason: Merged-In I96203b8cd037fd81b0b1d88fc5ca9915df02a919 with SHA-1 db026a8c is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2577513



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