Merge "Refine set_sched_policy behavior" am: 6075b1fa9a

Change-Id: I2d18ee9868ab052a731c35328cc270ce7e5702ee