Merge "Add VoPS support info for NR" am: 98763306a2 am: e6cbb031cd

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

Change-Id: I22e45b1888aa870708c66aa89926e4e98b9bc25f