[automerger skipped] Merge "Use StopServicesSetup to stop/start framework." into rvc-dev am: 2e59c22326 -s ours

am skip reason: Change-Id I83cffadfff15e6352a69641c3227efb63e7a34e4 with SHA-1 8a648312f8 is in history

Change-Id: Id9f5def3a85c90d98c2be54080ead4e7f21d95b0