Merge "AudioService: synchronize BT_SCO on and A2DP or LE suspended states - take 2" into udc-dev am: f2afed1d am: be8f6d15

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



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