Merge "Replaced setQsExpanded calls in NPVC with listener" into tm-qpr-dev am: 0a8514887b am: c35a20a300

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

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