Merge "AudioFlinger: Update Thread DefaultKeyedVector to std::map" into main