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

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

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