[automerger skipped] Merge "Support multiple RANs in one request for setSignalStrengthReportingCriteria" am: 6c6116a542 am: 806755bf6f am: 3a38d07a6d am: 5059b6d421 -s ours

am skip reason: Merged-In Ic6762e8ca488a119b1103319e7443c4342530f8c with SHA-1 9073f55722 is already in history

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

Change-Id: I980435ca4b3570e4b087f674532b460f0f016524