Merge "Merge "Ambient indicator text color" into oc-dr1-dev am: 5c6c7586cd am: f7fd8bb284  -s ours" into oc-mr1-dev-plus-aosp