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

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

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



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