Merge "Merge "Define priority for video threads" into oc-mr1-dev am: 70ab6cb09c" into oc-mr1-dev-plus-aosp
am: 1f962f664b

Change-Id: I7ab6afdf6ec6f8c3641e299e0486c30a10720fb1