[automerger skipped] Merge "Add a device overlay for radio off delay due to IMS deregistration" am: 6a5e5945 am: e211df78 am: b26396ab am: 48942a0a -s ours

am skip reason: Merged-In Id7b16d75c512106b56cb49974570811679498a0b with SHA-1 79bc4faa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1832710

Change-Id: I0db444a5479252c3edf598bcec0cf8e7bfc823f6