Merge "Enable Telephony AIDL-HIDL shim HAL"