Merge "Make pip size spec calculations more precise" into udc-dev am: db861395

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



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