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

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



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