Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
am: 7de9af3b8f
am: b7c8809d3b
Change-Id: I1d55f21e8eb11aea2d88128179381e5055d8577a
This commit is contained in: