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: 76e8e6d3 am: 3d6bd1da

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



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