Merge "Limit the uniqueness of SignalMeasurementType instead of RAN in SignalStrengthUpdateRequest" am: 68b121111d

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

Change-Id: Iba5234e267a672be13a0262c53b93a5b1996c5a7