Merge "Merge "Dark theme upgrade broken" into rvc-dev am: e95887d548 am: d87fbcc316" into rvc-d1-dev-plus-aosp am: 05aa697041

Change-Id: I9af0d14b3425fdcb2043e43207bc0dc5f176b4db