Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev
am: 4ac942f140

Change-Id: I3d09e6fe436ae1ced8f9ed88e919f1d9bb5e52db