Merge "Add config_demoModePackage to symbols" into oc-dr1-dev
am: 3789b629c7

Change-Id: I859bc8f2f1d314bb6a50741cb8e393be94cdbae6