platform_tools_loganalysis/test_framework/com, branch master

Revert "Merge "Revert submission 9940985-qpr1-dev merge" into qt-qpr1-dev am: 1cbccc3fa3"

2019-12-20T20:04:37+00:00

This reverts commit c1e08957272b7fed91fabb46775bbc2e7278c0f9.

Reason for revert: broke builds
Bug: 146660303

Change-Id: I7607d0a36b55e15868e771f62c548842b9e29679

Revert submission 9940985-qpr1-dev merge

2019-12-20T15:53:44+00:00

Reason for revert: broke tests b/146476630
Bug: 146476630
Reverted Changes: Ib3436a42b2ca8c9614939a30fb548ab39bc23e57

Change-Id: Ic936e0f03b001fff37308bb576376299c5ebef20
Exclude merging into branches that contain last aosp change included in merge.
Merged-In: 483ea33b74d7008d909e817c754ba9165ae704b1

DO NOT MERGE: Adding required loganalysis changes for tradefed merge into qt-dev.

2019-12-17T22:30:42+00:00

Bug: 143908003
Change-Id: Ib3436a42b2ca8c9614939a30fb548ab39bc23e57
Exclude merging into *-plus-aosp branches, since they already include the change.
Merged-In: I2ae86ba9706747873268192988c32879005ed0f7
Merged-In: I38efc115f2c691754d481fdffb6630607ef970e8
(cherry picked from commit c7bcaba872c7d82286960c750edd67e56ee73712)