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

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



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