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: 1530c466 am: e030668d am: 786a6dec

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

Change-Id: I3569252bdad698d8c07727da56779e0fb83a5bb4