Merge "fixed handling of data URI schemes in Intent.toUri" am: c3d3cf5666
am: 928b7cba47

Change-Id: I1c41d3eb7ac815b8cf04879fbeee70a66d5a2a3e