Merge "Add logging for b/280105659" into udc-dev am: 4763e710 am: 9ef267c8 am: 530aab44

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



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