Merge "Stop audio after call without disconnecting device" am: e17c3845ee am: 9c90c46b6d

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2041683

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