Merge "Fixed a bug where notifications could be dimmable" into oc-mr1-dev am: 510cdad67b
am: a815dfb0fe

Change-Id: I2fca1a8a7156616c8a3df6d49c654174fc9dd1aa