Adding CONNECTIVITY_KEEP_DATA_ON to handle Safety Situation

Bug: 302057004
Test: Manual | Units Tests

Change-Id: I2228a8f91e716ea33e081577ba522ea7023898e6
3 files changed