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 am: 1e317957

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



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