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

Change-Id: Idd21ecfee03c4fa3a22492528746e222818da86e