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

Change-Id: I1b15d433281eb1750847d34f796476dc579667ff