Merge \\"Fix thread priority after boosting.\\" into nyc-dev-plus-aosp am: ab11a7dd1c
am: ef68b1803a

Change-Id: If5bf4d8100fe8c6bb52ae3ed176cbc5a7a387ba5