Merge "Ensure child task has activity type set" into tm-qpr-dev am: 54115fb7 am: d68ab20b

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



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