Merge \\"Fix the API compatibility of \\"UriMatcher#addURI\\"\\" am: 3e151273a3
am: bc8d946e09

Change-Id: I6ab069a0e02e6b1053dafe98671ab68ef99ff527