[automerger skipped] Merge "Respect previously resolved size if layout has no size value" into sc-dev am: 1a852b89 -s ours

am skip reason: Change-Id I1f841aa85d9586785f6baf9628cb627efcf50b98 with SHA-1 45107f47 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1eb61071e0cce740567b1943721d5c338fe0594d