Merge "Make buildinfo_prop depend on build number file" into main am: daba74e7 am: a256b1a4

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118317



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