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

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



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