Merge "Use max height attr as backup for device config" into tm-dev am:...

Merge "Use max height attr as backup for device config" into tm-dev am: 248de47f am: b17d87fc am: 36e4c65c

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



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