Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd am: 10db7d421b am: c28f3e7ac0 am: 613e738f98

Change-Id: Iba8daab9f7e0402043d7796cb32fbfec6e44769b