Merge "Enable perfetto tracing for non-autogenerated AIDL names" into main