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

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

Change-Id: I0d456509b02715b141a6110ef89a476995ce5d67