Merge "Add additional logging for b/227115380" into tm-qpr-dev am: 5bfca357 am: 6559eb36

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



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