Merge "Dark theme not turning on/off when in twilight mode" into rvc-dev am:...

Merge "Dark theme not turning on/off when in twilight mode" into rvc-dev am: 04041cf1 am: ca03ee50

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

Change-Id: If45ede0b9357017fe4603e1c3e518820931e5105