Always call stopMeasurementCollection before startMeasurementCollection

Bug: 253453668
Test: manual
Change-Id: I9f85c6be7a79540fd5fd8b851695c0de1742853d
Merged-In: I9f85c6be7a79540fd5fd8b851695c0de1742853d
(cherry picked from commit d30c1cea07e7de45a3cb4b0a204a08242163d974)
1 file changed