removed/disabled a couple build.prop tweaks to improve battery life

Change-Id: I439fafd09884ea0f07edf986a7180bc89b6b788a