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

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



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