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

Change-Id: I7a4403d0611666b81c354f67cf479206d2c2d7ae