Merge "Check task switch by comparing leaf task." into tm-dev am: f55e3645 am: d92bc73b

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



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