Merge "AOD: Increase alpha values when dozing" into oc-dr1-dev
am: 19d8e4e04e

Change-Id: I13a82962cf43401f192c9eecb475e3aea847166b