Merge "Change the summary string to exclude 'Audio output' feature" into...

Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa967 am: 3608d5bf am: bab462f1 am: bc62033a

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



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