[automerger skipped] Merge "Fix the same active time tasks disappeared on RunngintTasks" am: e55bd1600f am: a5125067a0 am: bd8bd00b6b -s ours

am skip reason: Merged-In Iee39e438224f3ef22bc0a9254be88eec842c61a6 with SHA-1 a163d1bfd5 is already in history

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

Change-Id: Ib0351ae3349c2292f23d4d23373a344c36b3937c