Merge "fixed handling of data URI schemes in Intent.toUri" am: c3d3cf56 am: 928b7cba am: 067cfb36 am: ef34f7b3 Change-Id: I9c5a3706850706053d26ecdadf602ab2fafe3e8d