resolve merge conflicts of c4d4d6e396bddd6851c96909cfb437193d8bb483 to qt-dev-plus-aosp
resolve merge conflicts of c4d4d6e396bddd6851c96909cfb437193d8bb483 to qt-dev-plus-aosp

Change-Id: I2ad9dea610ba005f55f946843c4a9e517b2682dd

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