[automerger skipped] Merge "Rememeber the last dark mode before shutdown when...

[automerger skipped] Merge "Rememeber the last dark mode before shutdown when in auto mode" into rvc-qpr-dev am: 9be04338 am: b8ee20c9 -s ours

am skip reason: Change-Id I78a490c0f083e92022e1995b3e19dc7dd567a7c3 with SHA-1 7bddda48 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12819439

Change-Id: I2833a1c302e709bc32c63abc3e545b7095d41256