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

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



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