Merge "Upload app_versioncode to pprof and firefox" into main am: ce9bf3fa19 am: d88007c0ae

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2845236

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