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

Merge "Merge "Check task switch by comparing leaf task." into tm-dev am: f55e3645 am: 16f304c9" into tm-d1-dev-plus-aosp am: 46cecd43

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



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