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

Change-Id: I91d20bc046b721456e0a141def790aeccfbd39a6