Merge "Persisting setDeviceVolumeBehavior calls" into rvc-dev am: d03a59938e

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

Change-Id: I72537a3093019228ad8bbd9fd8e6f1ccbc48ff90