[automerger skipped] Merge "Limit the uniqueness of SignalMeasurementType instead of RAN in SignalStrengthUpdateRequest" into sc-qpr1-dev am: 7c37a48268 -s ours am: b52829de6c -s ours am: c5a6e10ef8 -s ours
am skip reason: Merged-In I87ea5e356189f61fc58dff80456aff35ea2a8e55 with SHA-1 924964767c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15880916
Change-Id: I0bc0e4c61fb0bc2b4368943fb7828f73ce993c06
This commit is contained in: