Merge "Merge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe am: 365dad5b79" into oc-mr1-dev-plus-aosp