Merge "Revert "Add temporary logging to root cause an issue."" into...

Merge "Revert "Add temporary logging to root cause an issue."" into udc-qpr-dev am: beb2aa5a am: 784fd136

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



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