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

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



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