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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11438155

Change-Id: I150b45b7c8e8e1f9d761af72fedffaf901bae5ab