Merge "Merge "Update colour to match toasts." into oc-dr1-dev am: 91866c65a5 am: ede09428f6  -s ours" into oc-mr1-dev-plus-aosp
am: ef2f0a36ea  -s ours

Change-Id: I4c1ff22f533bb1e2e49171a37119b8df5242295d