Merge "Do not consider embedded task as task switch" into sc-v2-dev am: 7ca65306 am: e4cdbf6b

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

Change-Id: I8cbae447d5e571d5c320663f963e13d283db8a26