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

Merge "AudioService: update display rotation monitoring" into tm-dev am: abcff90b am: 3cc075c0 am: 06160619 am: 6fbd04e3

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



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