Merge "Merge "Limit the uniqueness of SignalMeasurementType instead of RAN in SignalStrengthUpdateRequest" am: 68b121111d am: 44a43030c4 am: c2a9eac9f3" into sc-qpr1-dev-plus-aosp am: bb07fc9412 am: ca6d79f522

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

Change-Id: Ia95dcba09b4b27a08b8552cca7636e6e32e1dee5