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

Change-Id: If121f3081afa10bdf6dc436f838769d4f23aa013