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

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

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