Merge changes from topic "remove-debug-color" into udc-qpr-dev am: d72c947b am: 3bc5e964

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



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