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

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



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