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

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



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