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

[automerger skipped] Migrated QosCallbackTracker to the new data stack. am: 0e55df93 -s ours am: 81cf3768 -s ours am: 1cfbe613 -s ours am: 831288f6 -s ours

am skip reason: Merged-In Ie0385211ec3e8c209bf1fda8bb40a5bbd18b52df with SHA-1 6b7c4941 is already in history

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

Change-Id: I18e08fc123ea2b2792e22cb4e81e1320c98acee1