Merge "Fix BottomSheetDialog after swiping it down" into nyc-support-25.2-dev
am: 7926717a99

Change-Id: I57e23be7811cf03d78a1b7a8797079ee00b734c0