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

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



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