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

Change-Id: I52290b149ecee7c6dc81f98b7ef0cafad2846010