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

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

Change-Id: I1f6e98429e4c981ac456e99e51111c1454b7065f