Merge "Split NPVC#mQsExpansionEnabled" into sc-dev am: c4399d63f5 am: dec2e4ae1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14938973 Change-Id: I32d8e56aa044195396d8d52b79438735b49fb59c
This commit is contained in: