Merge "Settings: Remove unused bg scan throttle settings" into pi-dev am: f4f317798b
am: 265efbd527  -s ours

Change-Id: I557f1b8f0f8ec1d8f61a8bc1350b35f021639faf