Merge "AudioService: fix SCO audio resume after call" into sc-v2-dev am: 14a62045ac

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

Change-Id: I912c54e434e8a72eeccc24638afbc5cb99eb1d61