Merge "Merge "Limit the uniqueness of SignalMeasurementType instead of RAN in...
Merge "Merge "Limit the uniqueness of SignalMeasurementType instead of RAN in SignalStrengthUpdateRequest" am: 68b12111 am: 44a43030 am: c2a9eac9" into sc-qpr1-dev-plus-aosp