am b39f3f46: am 1c1c06fa: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev am: 3136c613e1

Original change: undetermined

Change-Id: Ia5798b0e82762dc0f0118ddce22a8ff84bf1de04