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

Change-Id: I811b1b7e0b62d4143292a94fd4b5478f74cdec24