Merge "Correct the value of cookie" into udc-dev am: a0d196d6 am: 5c5c0cba

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



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