[automerger skipped] Migrated QosCallbackTracker to the new data stack. am: 6653cdb4 -s ours am: d6753653 -s ours

am skip reason: Merged-In Ie0385211ec3e8c209bf1fda8bb40a5bbd18b52df with SHA-1 4c1fd2c1 is already in history

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

Change-Id: I832936b542ce30facfbf46bd7299f789b689ac0b