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

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

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