Merge "Merge "Fix language in packaging file for ContentProviderPaging sample" into oc-dev am: 4686d90d am: 628dbc94 am: 63182f78" into oc-mr1-dev-plus-aosp