Merge "Recalculate view's height when tab is selected" into tm-dev am:...

Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f633482 am: 47b4c865 am: 7ab5a444

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509



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