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

Merge "AudioService: update display rotation monitoring" into tm-dev am: abcff90b am: 3cc075c0 am: b8178d8a am: 7ec6db56

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18806553



Change-Id: I6625f4099563a8cc46e06d1bcea99e91a04eca58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>