Merge "Add tracing to wallpaper local colors" into tm-dev am: 20514d4e am: 19773adc

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



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