Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25

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

Change-Id: I369b03f9371b0b8063f9f63b94f83b9b18555f4a