Merge "Don't collect task on activity-start" into tm-qpr-dev am: e30befa0 am: 3ef452f4

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



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