Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev am: 484115b77d  -s ours am: edc3af3f91  -s ours
am: c3619bceda  -s ours

Change-Id: Ie92d4d8c95da45056261cddadb86ee26f36644fd