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

Merge "Merge "Add logging to NPVC" into tm-dev am: 9750b0ca am: a72482fa" into tm-d1-dev-plus-aosp am: 8ae069b7

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



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