[automerger skipped] Merge changes from topic "null_data_call" am: 879e132f...

[automerger skipped] Merge changes from topic "null_data_call" am: 879e132f am: d3cfa2ae -s ours am: 09c7afd2 -s ours

am skip reason: Merged-In Iefe5754282611a51c8e7e023d2840729c9615924 with SHA-1 35b276b8 is already in history

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



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