Revert "[CS] Make NPVC and QuickSettingsController singletons." This reverts commit 8f5e6f8b8f1022df584fd72f7ad1b33b6d9299f4. Reason for revert: b/289170037 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d5fb4ee36743f36741faab118dd677ef494ec6cf) Merged-In: I00454e39203b375b35423b2d31418f63ed93927d Change-Id: I00454e39203b375b35423b2d31418f63ed93927d