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

Change-Id: I17d9bd0dc0ab2b4129aefc21f649da5990831067