Adding "wait-before" and "wait-after" to task policies

Change-Id: I8ff2ee4172083cdf8380d8af4a813978cf5df3fe
Merge "Adding "wait-before" and "wait-after" to task policies"