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

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

Change-Id: Ief49d50a5b376cd5a274e0bf79d2d34b077a9a1e