Merge "Blacklist doze setting from tuner reset" into pi-dev am: 49cb81658d
am: 94dae6421d

Change-Id: I5913ca4b1f35e834723bbc771a8fdebe12b7a7a8