Merge "Fix issue with wrong style being used in landscape" into tm-dev am:...

Merge "Fix issue with wrong style being used in landscape" into tm-dev am: 8e53c052 am: a2ec97e5

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

Change-Id: I6776e0f99f11059e7e0000b482b376458aca257e