Merge "Annotate ContentResolver/Provider arguments." into mnc-dev