Merge "FCM: add c2 software, IConfigurable instances" into main am: 75275ce51e am: 33fcf56f2c am: 3da1fa5fa1 am: 3390e26143 am: 5c6efdebe4

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

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