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

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

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



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