Merge "Remove @hide CollectionUtils in QosCallbackTracker" am: 12acf15141 am: 8397f20aff am: 338c005da1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2c4a517556e8fb397dcd64c3f121c90e40bd6d2