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

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



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