Merge "Use DisplayListener instead of WindowRotationListener in AudioService." into oc-dr1-dev