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

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

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