Merge "Fix the reset of boosted zygote thread priority." am: 83aceea07d am: 55310df6bc
am: 4c618d8933

Change-Id: I7be43bedad9a3e189e64f140b585070b6ba6ee33