Merge "audioservice: fix camera sound control for dual SIMs" into udc-dev am: 0585fb67

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



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