Merge "Add support for sending d2d messages through adb shell command." am: 7a58ad001b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2f9cbfa88d1861de2ba6fd65e31a41f5e331144