Merge "Send Empty packet in MSRP" am: b3291bb1f4 am: 724d3eabe8

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1608753

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b29a8ba688ea73eb4c9ff127a4d121e01684b99