Merge "Check if tracing is on before generating strings" into tm-qpr-dev am:...

Merge "Check if tracing is on before generating strings" into tm-qpr-dev am: 30774919 am: 66a55bfc

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



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