[automerger skipped] Merge "Add support for selected contacts device to device sharing." am: 83bc8699a1 am: a9a60d31bc am: 71de23564d -s ours

am skip reason: Merged-In I4f6da463a29ba9cf067d36941a9b4e584012c817 with SHA-1 2bd23cfbcc is already in history

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

Change-Id: If875e37610b59e5643b886926d1eb0357a00f586