Merge "Extract most QS code from NPVC" into tm-qpr-dev am: d82af72383

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

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