Release stable. Use the contents of aosp/1879477 into the next stable release.
Release stable.
Use the contents of aosp/1879477 into the next stable release.

Change-Id: I05fe66e6a15f59f228fe202ae845e79072dfb4f1

google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto