Merge "Merge "Force-set a ClipData to prevent later migration." into rvc-dev...
Merge "Merge "Force-set a ClipData to prevent later migration." into rvc-dev am: 56495051 am: 6fa9586c" into rvc-d1-dev-plus-aosp am: d5a57666 am: e64ffe3e
Change-Id: I380e1aef5b1d7088624136ddc035b2a0118bf227