Merge "RotationHelper: send active displayId to audio HAL" into sc-v2-dev