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