[automerger skipped] Merge "Inject NPVC into ShadeControllerImpl" into...

[automerger skipped] Merge "Inject NPVC into ShadeControllerImpl" into udc-qpr-dev am: 148f3183 am: e9ee76d7 -s ours

am skip reason: Merged-In Ia58178b37f3179ff10ac7476f78394e7874e790b with SHA-1 aa6f398c is already in history

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



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