Merge "Rememeber the last dark mode before shutdown when in auto mode" into...

Merge "Rememeber the last dark mode before shutdown when in auto mode" into rvc-qpr-dev am: 9be04338

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

Change-Id: I97a361d1f6e43f82ee2f560f91b7e7a1344234a7