Merge "Merge "Persisting setDeviceVolumeBehavior calls" into rvc-dev am: d03a5993 am: 6a7997c4 am: b58312a2" into rvc-qpr-dev-plus-aosp am: 1a4bcd4f

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

Change-Id: Ie928a8fee03813960059117c1b3ce1ce79ef6bb3