Merge "Revert "Revert "[CS] Make NPVC and QuickSettingsController singl...""...

Merge "Revert "Revert "[CS] Make NPVC and QuickSettingsController singl..."" into udc-qpr-dev am: a855866f am: 1a798a32

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



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