Merge "Merge "Merge intervalMillis of GnssMeasurementRequest" into tm-dev am:...

Merge "Merge "Merge intervalMillis of GnssMeasurementRequest" into tm-dev am: 75fb4d30 am: fd2a632b am: 431c2f58" into tm-qpr-dev-plus-aosp am: 1b573a9d

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



Change-Id: I17d3d6f1795a20972bd4af5e781e7855c02057bc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>