Merge "Calculate apk size multiple times" am: 223579af am: 89cc942a am: 9615331f

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



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