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

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



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