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

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



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