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

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

Change-Id: If82b8903dba4cfbcc762b218f6cec6c5e704b92b