Merge "Modifying base_system to use the new SoundPicker flag" into main am:...

Merge "Modifying base_system to use the new SoundPicker flag" into main am: cde60cac am: 88056fa1 am: 666c543d

Original change: https://android-review.googlesource.com/c/platform/build/+/2769209



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