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

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

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



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