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

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



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