[automerger skipped] Migrated QosCallbackTracker to the new data stack. am:...

[automerger skipped] Migrated QosCallbackTracker to the new data stack. am: 6b7c4941 -s ours am: 71edf7db -s ours am: b72cce4a -s ours

am skip reason: Merged-In Ie0385211ec3e8c209bf1fda8bb40a5bbd18b52df with SHA-1 6653cdb4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17093405

Change-Id: I4e8ef1a47249b2cfaa6fcf5f3f3dbe24eaee13b6