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

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

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