Merge "Force-set a ClipData to prevent later migration." into rvc-dev am:...
Merge "Force-set a ClipData to prevent later migration." into rvc-dev am: 56495051 am: ac0b080b am: 5ed786a0 am: 7108a9d3
Change-Id: I586d2de27db22eef1257723a438a46a845c30740