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

Merge "Merge "Return the activity type of any child activity in the Task" into tm-dev am: 2b8d1c35 am: 9b48a8af" into tm-d1-dev-plus-aosp am: 7ef1053d

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



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