[automerger skipped] Merge "Fix NPEs in DataCallResponse" into tm-qpr-dev am: 680dc13217 am: 4299feccaa -s ours

am skip reason: Merged-In I6403f71126e3e5ab300c565cf0c528268cbfe69d with SHA-1 f5d175116f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20421638

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