Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev
tree: 817aeddfbb613e791217aff06fccd9b3dae075b6
  1. core/
  2. services/