tree e7922099f991bc335989112a6f0cdd84b38b157c
parent 890dbd12059c90ca8446011c66adad49f669e356
parent 2171996c6587cc2cec7f86a2a5d322ce0709ca90
author Treehugger Robot <treehugger-gerrit@google.com> 1618917991 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618917991 +0000

Merge "Don't update volume in AudioService when SAM is on and ARC is off" am: 461594522b am: 2171996c65

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

Change-Id: I9f238154a1d5193c3a16c499f41e0c83a3af4819