[automerger skipped] Merge "Always call stopMeasurementCollection before...

[automerger skipped] Merge "Always call stopMeasurementCollection before startMeasurementCollection" into tm-qpr-dev am: a577c1d8 am: 84066720 -s ours

am skip reason: Merged-In I9f85c6be7a79540fd5fd8b851695c0de1742853d with SHA-1 d30c1cea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20228988



Change-Id: I52d87824e98c8f7f17a5bf1dfd08704fc950f9ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>