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

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



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