Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66 am: 24a1598b5b" into oc-dev-plus-aosp
am: b8891f3313

Change-Id: I720bd19e970176f7679c1f705a9d1168ce713577