Moving CM/SamsungServiceMode dependency to default manifest

Change-Id: I6481ffd42d5d5930cf1449c06188942e76bd30a9