Merge "non-mainline telephony related AIDL refactor/decoupling"