Merge "Dark theme twilight mode not initializing properly" into rvc-dev am: 284afca8 am: ab4d9abd am: 86165211 am: a71816ad

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

Change-Id: I923c5ac97326033bfeefdfa7ed4ffb2fbd005410