Merge "Add support for selection of Opus in Developer Options" into tm-qpr-dev am: cb930bc0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17901372



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