Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" am: ce7d32096e am: 333fdf8c59

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

Change-Id: I88f4bab6d15ae71456f85f51391c942dc9c8875f