Merge "Annotate ContentProviderClient arguments." into mnc-dev