[automerger skipped] Merge "Fix the same active time tasks disappeared on RunngintTasks" am: e55bd160 am: a5125067 am: bd8bd00b -s ours am: 62aab36a -s ours am: 5df46f5d -s ours

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

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

Change-Id: Icd0b811d6d79aad0dc067ec814899826b2d08748