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

Change-Id: I17a8a833233b1857c06e8e19b18b7e0b7074a641