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

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

Change-Id: I3f7e267a42696fafdd3c0dca77e2c0666ec2b007