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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2aad0e5f2830690cc09d234da8c5b40b1f30b6f