Merge "Update dynamic height adjusting" into sc-dev am: 81d98b0410

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

Change-Id: I10d435d6dd391a25ce4c8e6f161760d656980c84