Merge "Dark theme twilight mode not initializing properly" into rvc-dev am: 284afca897 am: ab4d9abd6c

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

Change-Id: I2cd309199afbd2efbd6f9c6d62589a70f99dbb3c