Make screenLayout calculation consistent

Generally this reverts [1] that uses the smallest layout
in all rotations. Because
1. According to the definition to screenLayout, it is more like
   the current size instead of smallest possible value.
2. Since [2][3], the configuration passed to app already only
   calculates from current size.

This fixes the inconsistent calculation, e.g. for the same size,
the task may calculate landscape configuration with LARGE and
portrait configuration with NORMAL. But the display always gets
NORMAL for portrait and landscape.

[1]: I85f90a16294ef5a7de94d5b9231abbc6f914fe90
[2]: Ie27020616983646b274b073f17accea627399df0
[3]: I0fcec4f035e466fafedc31be5925c0b04a6580f7

Bug: 233855302
Bug: 253386061
Test: atest DisplayContentTests ConfigurationScreenLayoutTest
Change-Id: If806e2a42a6c3c548d93ba43c1aed69889901193