[automerger skipped] Merge changes from topic "move sched_policy functions" am: 2a2b4eec35 am: ef974c1a36
am: 6cc4c4ff65 -s ours
am skip reason: change_id Ia8bc5b447efa568fd1c822746919fa1496cc42a6 with SHA1 3b3a1c8622 is in history

Change-Id: I8bcd6014e39baef6eb45b352f045029abb42bc92