[automerger skipped] Merge "Use StopServicesSetup to stop/start framework."...
[automerger skipped] Merge "Use StopServicesSetup to stop/start framework." into rvc-dev am: 2e59c223 am: ba0eaddb -s ours
am skip reason: Change-Id I83cffadfff15e6352a69641c3227efb63e7a34e4 with SHA-1 1a380f7b is in history
Change-Id: Ied8816e4ccacaf409f6165f1f6eb50abf40ecac0