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

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

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



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