Merge "Refine set_sched_policy behavior" am: 6075b1fa9a am: 0c1f55b3ed

Change-Id: I58e971729d663036d6111158f33edcba45ffa576