Merge "Avoid ClassCast when migrating ACTION_SEND extras."