Merge "profcollect: Collect camera traces for a longer duration" into main am:...

Merge "profcollect: Collect camera traces for a longer duration" into main am: 10eddfef am: 0ad033f1

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



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