Merge "Merge "Dark theme twilight mode not initializing properly" into rvc-dev am: 284afca8 am: c6fb2df3" into rvc-d1-dev-plus-aosp am: 0f7a88b0

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

Change-Id: I0a5b14b9324508cb235e380f0236111c50700b3d