Merge "Fix malformed trace section" into tm-qpr-dev am: 251eda5b am:...

Merge "Fix malformed trace section" into tm-qpr-dev am: 251eda5b am: a06e522b am: 64813286 am: 76bd492e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21894360



Change-Id: I015f84e92feb7c56407d76342e102cbfe78744ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>