Merge "profcollect: rename variable" into main am: 2c67c1cda0 am: a9b3c06361

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

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