Merge "Calculate min height for header in code" into tm-dev am: 04269d83 am: af7e3a7d

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



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