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

Merge "Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5 am: 35d03040 am: 5784bbd8" into rvc-qpr-dev-plus-aosp am: dc8f57f4

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

Change-Id: I25bad13ae689d54484e960a0e7cfde55aab6e3e9