am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev

* commit 'e50b0a6c86c70f5ddcb69984cb99337ce1d96032':
  More ACTION_CHOOSER ClipData migration.