[automerger skipped] Merge "Don't update volume in AudioService when SAM is on...

[automerger skipped] Merge "Don't update volume in AudioService when SAM is on and ARC is off" am: 46159452 am: 2171996c am: 3af62d24 -s ours

am skip reason: skip tag Change-Id I412ee9d5b1ba7aab382e73deab8ac19546175842 with SHA-1 27466147 is already in history

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

Change-Id: I323dd671dd6b5c1bfac2bdd8ec8ae585bb33397f