Merge "Upload app_versioncode to pprof and firefox" into main am: ce9bf3fa19 am: 5d53dd0687 am: 01770bb1c4

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

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