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

Change-Id: I2a078e098bf879b34fbcb54d82b25b6cd19c65a9