Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3

Change-Id: Ibb1ccf9625f7aa7d644bd5f4071068af007507ec