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

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



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