Merge "Add updateTrackMetadata support with audioSerssion_2_2 control" am: 5ad2fe4589 am: 28e51040cc am: 20c04c09a7 am: 012b154f61

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1955919

Change-Id: Id96cfbbc831dc4d14cac22150c88c57e688c19de