[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: de01d84b -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: If7ab9b3fb71ec27be8ba6e963076afc220f9e7b4