Merge "Add logging to NPVC" into tm-dev am: 9750b0ca

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



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