Better support portrait mode for foldables

Specs for tablets (wide & tall devices) were getting applied to
foldables when in portrait mode. These spacings were far too large for
the shorter screen.

Fixes: 256865630
Test: Manual - Use all display size combinations on foldables/tablets
Change-Id: I102d39850706c81287991569b21bd9a01be84ca8