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 am: c04be763

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



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