Merge "Add a pre condition and add EXTRA_HONORED_ARGS paramter to the reuslt Bundle to the example ContentProvider." into oc-dev