Merge changes Ic9b69da9,Idf7b79aa into main

* changes:
  Create a null HIDL wrapper if AIDL is registered
  Use the real component store for AIDL C2