Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-dev
am: 8e70a2826e

Change-Id: If163d5f269978e481935a9943b1cc72fbc4ff59d