[automerger skipped] Merge "Use StopServicesSetup to stop/start framework."...
[automerger skipped] Merge "Use StopServicesSetup to stop/start framework." into rvc-dev am: fa891cb1 -s ours
am skip reason: Change-Id I5d5326f415352d50ace7f456d29b257d1d769318 with SHA-1 8aa40102 is in history
Change-Id: I93a339c9af7ed0e83a24bd8b08d14e82513f9434