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: 1ac85c9e

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



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