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: 377f1097 am: d20bf160 am: e71e0a87 am: 69091330 am: 4ecd5386

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

Change-Id: Ia26101c36be0c46f1b5785187a08ac9b0a837975