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

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



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