[automerger skipped] Make sure to handle all pending data one by one am: d0479606 -s ours

am skip reason: Merged-In Id7f397a5bb39f65a65d93d278a025947031b3863 with SHA-1 7fb74d55 is already in history

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



Change-Id: I8930040739d91f4b14efe2d06dd75d43a6be75e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>