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: 842eda93

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



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