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

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



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