Merge "Shorter notification text on AoD" into oc-mr1-dev
am: 371ed39c93

Change-Id: I1d719ba5224081712ce4463215cfdcc980ed7749