Merge "Force-set a ClipData to prevent later migration." into pi-dev am: d5c2fb380a

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

Change-Id: I0d01e8325beae6a69b88a38887863b222be01b95