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 am: e0e56027

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



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