Merge "Hide wifi and bt in battery settings" into oc-dev
am: 05777a7918

Change-Id: If676ec0119bebed800727f618225fd355e9da74f