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

Change-Id: I385ad45a269cee3614c9ffc4db6527b97a9434d1