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: d5fcde5f

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

Change-Id: I30c7cf15a5fc024539e87156dd410412c85ab7d9