Merge "Snap for 13312063 from 7b600a15455efae0d76557970daaaab22f4b0c03 to androidx-tracing-release" into androidx-tracing-release