Merge "Avoid too long trace section name to crash FrameTracker" into tm-qpr-dev am: 242b670b

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



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