Merge "Merge "CSD: clean up sound dose test API" into udc-dev am: 31ee265e...

Merge "Merge "CSD: clean up sound dose test API" into udc-dev am: 31ee265e am: 7f059b7b am: cc21d534" into udc-qpr-dev-plus-aosp am: 3dfe03c2

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



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