Add more modes for volume updates am: 6642aecb am: f415cd4e

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



Change-Id: I653831d45af30847fad163068874daa61736906f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>