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

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

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

Change-Id: I5b22bce11a1d2d6395a33a363276c79ecee01c7e