Merge "Revert "HWUI: Turn on Skia tracing by default"" into tm-dev am: 3ec8ebaf am: 47147182

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



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