Merge "Add extra logging" am: 47b98a2d38

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

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