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

Merge "AudioService: update display rotation monitoring" into tm-dev am: abcff90b am: 322db851 am: 0f5bd2dc am: cdc138ed

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



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