Merge "Use DisplayListener instead of WindowRotationListener in AudioService."