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