Merge changes from topic "re-revert move sched_policy functions"
am: 1bcb634958

Change-Id: I82fc5590deaec7878bd87bb338544b72299b89fc