Merge "Inject NPVC into ShadeControllerImpl" into udc-qpr-dev am: 148f31836a

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

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