Merge "AudioService: update display rotation monitoring" into tm-dev