Revert "Refactor IC support for RKP" am: 201e6abbd0 am: ac0c77ad28 am: 119c505c70 am: aef3537180

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

Change-Id: Ifcab62edd588f50317124d563602a4c41e43e950