Merge "Use StopServicesSetup to stop/start framework." into rvc-dev am: 2e59c22326 am: ba0eaddb4f

Change-Id: I8f744f78a7e836c5b1e42422d539c03a0bcc926d