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

Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f633482 am: 47b4c865" into tm-d1-dev-plus-aosp am: 2de1730c

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



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