[automerger skipped] Merge "Limit the uniqueness of SignalMeasurementType...

[automerger skipped] Merge "Limit the uniqueness of SignalMeasurementType instead of RAN in SignalStrengthUpdateRequest" into sc-qpr1-dev am: 7c37a482 am: 5c43933d -s ours

am skip reason: Merged-In I87ea5e356189f61fc58dff80456aff35ea2a8e55 with SHA-1 5fe9ded1 is already in history

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

Change-Id: I14ba8cb146f03866f98770bf0b3229cd4f55132b