[automerger skipped] Merge "Sort running task by focus and visibility" am: 89bda313 -s ours

am skip reason: Merged-In I7f7d5e72fbf73988b58c23f8a11dff05dbc1b3f1 with SHA-1 a1df4706 is already in history

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



Change-Id: If7046ebea9507ff992968662ab27aaa697f9c108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>