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

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

Change-Id: Iba7d98bfce2d8454cfe0b69b67937ffa15ae44cc