Merge "Optimizing Log Messages" into udc-dev am: 398e2d0d am: 29eded94 am: 1862ffe2 am: 474f9d8e

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



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