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

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

Change-Id: I214de776e8cfb34bbb7dc5a48de4e04a2747a544