Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev am: 4ac942f140 am: cb03504d21
am: 0535a4a461  -s ours

Change-Id: Id58f34f451e447cfe45c366bee754c2167df1fe0