fa8c0a9a62
[ Merge of http://go/wvgerrit/156997 ] Several of the Android integration tests perform direct URL comparisons between fixed URLs and the server URL returned by the CDM. With provisioning 4.0, the CDM will append additional query parameters to the server URL. This updated URL still contains all of the original expected information, but with additional parameters. So long as the URL contains the required fields, any additional parameter should be considered valid. The gtest framework used by the integration tests allow for the creation of custom "matchers", rules that can be used to validate data and create informative failure logs. The CL creates a new matcher for checking that a tested URL is a superset of content of the expected URL. Bug: 244319313 Test: request_license_test on prov 4 device Change-Id: Ie721058fa628b3a4a74dc56f4172a3dfcb1f1ef3