Merge "Add extra logging" am: 47b98a2d am: 9479208d

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



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