Merge "Fix the same active time tasks disappeared on RunngintTasks" am: e55bd1600f

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

Change-Id: Ia42e95fc32765a6163ddbef0da0648764ead6a1b