Merge "Support multiple RANs in one request for setSignalStrengthReportingCriteria" am: 6c6116a542 am: 806755bf6f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1888982

Change-Id: I1f1c6f17df6dd934dc7ccc8b53133f0d5a903ce3