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

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

Change-Id: I402237ce71cf2084085d1375380c4aada6d8aa1a