Merge "support changing audio-hw-sync-id during playback." am: 2f844ad433

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1648029

Change-Id: Ia0bdd7231e0e7b71e7e2926c12a47312c96d96b4