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

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



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