Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f633482 am: 025baa31

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



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