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

Change-Id: I75bf198fe6d32ef3dcb4080b17d9f8fe2ab0dbce