Revert "rfkill: watch and set NetworkManager wwan-enabled"

There are no consumers for this API in 3.10 so there's no point in
having it.

This reverts commit 5ad90d8e5b44b0a55a6446c54068d3bf7003054c.
power: Fix the composite device percentage with a single battery

This hunk got moved in 6680d0f0812935fa982c2645930e6f0f4c1d93ed by
mistake. Move it back.