Merge "Add extra logging" am: 47b98a2d am: 9479208d am: 09d3410e am:...

Merge "Add extra logging" am: 47b98a2d am: 9479208d am: 09d3410e am: 0ec82bc2 am: 173ca4b9

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



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