Merge "Add TRACE_TAG_AIDL to SystemApi for mainline modules"