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

Merge "Merge "Merge intervalMillis of GnssMeasurementRequest" into tm-dev am: 75fb4d30 am: 637ba3ac" into tm-d1-dev-plus-aosp am: 2bd35644

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



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