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: I67cf6b10f5446e67b750306eb54245388028a8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>