[automerger skipped] Re-enable volume control for non-grouped devices am:...

[automerger skipped] Re-enable volume control for non-grouped devices am: b7f52f44 am: 5f9c2120 -s ours am: e4abc3a9 -s ours

am skip reason: Merged-In I7740d78f3a7dca62d64e6cf7b8c9ffa1578c8e74 with SHA-1 f68e7fb4 is already in history

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

Change-Id: I6d347139141cb382ffc2ba1e587c3ea5265e7d45