Merge "AudioService: prevent unmute on vol raise when muted by ringer/zen"...

Merge "AudioService: prevent unmute on vol raise when muted by ringer/zen" into udc-dev am: 3bd9c629 am: d32ae865 am: c62161e0

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



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