Merge tag 'android-11.0.0_r48' into int/11/fp3

Android 11.0.0 Release 48 (RD2A.211001.002)

* tag 'android-11.0.0_r48':

Change-Id: Ib9e0de7945f3bc6eeacef25e715151354d36d3e1
diff --git a/version.mk b/version.mk
index 90fe55e..f50a46a 100644
--- a/version.mk
+++ b/version.mk
@@ -92,7 +92,7 @@
 # - For build server (t=1):  M.mm.bbb (nnnnnn-ad)
 #       where nnnnnn is the build number from the build server (no zero-padding)
 #       and hh is the git hash
-# On eng builds, the BUILD_NUMBER has the user and timestamp inline
+# On eng builds, the BUILD_NUMBER_FROM_FILE has the user and timestamp inline
 ifdef TARGET_BUILD_APPS
 ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
     git_hash := $(shell git --git-dir $(LOCAL_PATH)/.git log -n 1 --pretty=format:%h)