Merge "FCM: add c2 software, IConfigurable instances" into main am: 75275ce51e am: 33fcf56f2c

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

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