Merge "Use DisplayListener instead of WindowRotationListener in AudioService." into oc-dr1-dev am: 4c66a1dd0d
am: 199ebcc5d2

Change-Id: I781602abeaeebfd548877b97c58a1f8b06553907