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

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

Change-Id: I1336f3dd4e8a8d10184013131d6cb810a546dfc3