Merge "Add and update log statements for desktop proto" into udc-dev am: 4dae2bfd am: c95afbb1

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



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