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: d992c398

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



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