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

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



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