Merge "Implement maximum cellular timeout to trigger VoWi-Fi emergency" into udc-dev am: b8da6bcc25 am: c05d452fd2

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

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