Merge "Fix speakerphone logic when connecting/disconnecting dock." into tm-dev am: 8c010100

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



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