Merge "Fix typo in android.net.Uri documentation."
am: 8dc7e43bad

Change-Id: Ibd56f995c4692db449ca3210da7cb5d6bcb5c5d3