Merge "Revert "Add androidx.tracing to sysui"" into udc-dev