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

Change-Id: Ia63097f8ea8c66b0451e69469768b1e04e6d5eee