Merge changes from topic "null_data_call" am: 879e132f

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



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