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

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



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