Merge "Change the order of dark theme options to match night light" into...

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

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

Change-Id: I677bb4c975d93bea2042d817fbfe6e7ba4c17610