Merge "Fix default app size for desktop proto 2" into tm-qpr-dev am:...

Merge "Fix default app size for desktop proto 2" into tm-qpr-dev am: 61a56748 am: 4c3804ec am: 583ab81c am: 047d0f44

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



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