Merge "Increase transitory state timeout to 10 sec." into udc-dev am: e484ee0e40 am: ba524d7be7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/22534800

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