Merge "If ProtoLog is not required, add fallback to logcat" into udc-qpr-dev am: 58143f2030

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

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