Merge "AudioManager: restore getVolumeGroupIdForAttributes behavior" into tm-qpr-dev am: 02cdf72ad3

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

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