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

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



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