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

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



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