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

Merge "Force-set a ClipData to prevent later migration." into pi-dev am: d5c2fb38 am: 8e8fbc89 am: d446e110 am: c56d34c2 am: 014b806c am: 5b663962 am: b8326ba9 am: 4782a990 am: ee53a501

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

Change-Id: I97953f71acb8a99b70f29fafcb6ec4bebe8ab876