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

Change-Id: I9c5a3706850706053d26ecdadf602ab2fafe3e8d