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

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

Change-Id: If7d8b675d5e2d680fef9298747a0426e21f533ae