Merge "Settings: Extend the data role swap timeout value" am: bb994f627f

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875

Change-Id: I42a32278a74fd99f6f397c2c9d489f4bd94b3dc0