[automerger skipped] Fix the status of tuple cannot be parsed because there...

[automerger skipped] Fix the status of tuple cannot be parsed because there are some whitespace characters before the Basic tag am: a73b542c am: 46d83edb -s ours am: a9ef5925 -s ours

am skip reason: Merged-In I32b9a257f5c0c5c8f69eb466962c5eb2633c4048 with SHA-1 8bf836b5 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1730231

Change-Id: I0d3f9e675d806a5b0ccc0c2a907238628698f19e