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: I04656f9bf9949692720c6b618c9678b9cc82a90b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>