Merge "Merge "Swap back content alphas for light and dark." into oc-dev am:...
Merge "Merge "Swap back content alphas for light and dark." into oc-dev am: e262cc23" into oc-dev-plus-aosp
am: 20a75de6
Change-Id: Ic130fd934bead375a55f0a760d21139efb8f6505