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

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

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



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