Merge "IInterface: remove some C++ AIDL exceptions" into main