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

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



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