Snap for 6915103 from 3da604b8524188eb6965fc43d22d6b4bfd7bd6b3 to androidx-tracing-release

Change-Id: I008a6d381ca63ee11c3c50f07c7da9e6ce3e22d0