Merge "Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8 am: 6a71949f6e" into oc-dr1-dev-plus-aosp