Merge "Fix zygote energy-aware scheduler tuning bug"
am: de029a894a

Change-Id: I7aeefcd7fc238e10ca74a4c101573eea9b51125f