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 am: 94a79060

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



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