Merge "support changing audio-hw-sync-id during playback." am: 507764f6a8 am: 2dd3576872 am: 0abd962e42

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

Change-Id: Ic60a0a502de6297278e253547321d782026564c5