[automerger skipped] Merge "[Bugfix]use walkFileTree to calucate apk size"...

[automerger skipped] Merge "[Bugfix]use walkFileTree to calucate apk size" into main am: cd1e48e9 am: 0674a81d am: 91682aad am: 6c784f04 am: 87243a7c -s ours

am skip reason: Merged-In I18852ced54ceeb63785033de3f1ab22a35ba1fc1 with SHA-1 ec5130d3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2777290



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