Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0

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

Change-Id: I91ffd5a10cf3b583d8a645951550a11e49891366