Merge "Modified to validate number of phones in scheduled retry" into udc-dev...

Merge "Modified to validate number of phones in scheduled retry" into udc-dev am: fa69e321 am: 498b7295

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/22120423



Change-Id: I80c295b111fc17bdefefaf9bdf751505cef917c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>