Merge changes from topic "tree_size" into main am: 82f40c90

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



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