Merge "Use StopServicesSetup to stop/start framework." into rvc-dev am: e8f9e0959f am: f2956479e3

Change-Id: Id4cb217a207c1633183a14163d27db216ec39221