Merge "Remove FlakyTest for testTaskChangeCallBacks" into rvc-dev am: 241f65ced5

Change-Id: If3c7f55a6b7fa11ba6231be5490566cf5208592b