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

Change-Id: If65f38f73f88f1615bdb071f0d6776907ec279c2