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

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

Change-Id: Ide029f3f8603474b3f30c7fc250c50e25cea2323