Merge "profcollect: fix camera event delay logic" into main am: 13736a02 am: 0c8a0199

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



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