Merge "Return the activity type of any child activity in the Task" into tm-dev...

Merge "Return the activity type of any child activity in the Task" into tm-dev am: 2b8d1c35 am: d965aa41

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



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