[automerger skipped] Merge changes from topic "move sched_policy functions" am: ca50ee91b5 am: e8b2ac49bb
am: 6738419e09 -s ours
am skip reason: change_id Icc052080e1bce46ce06f7264446950cab0490a95 with SHA1 634e884419 is in history

Change-Id: I80026ca51b85fa55a4051acdfca216da040a714d