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

Change-Id: I5527611a091e5e2c97d3e44339b696015bd1f13b