Merge "Replace InterfaceConfiguration usage with stable aidl"