Merge "Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-dev am: 8e70a2826e am: 323b7e6f9c" into qt-qpr1-dev-plus-aosp
am: 979d8512e3

Change-Id: I75b17210508911ca2779ec81ea0516ad038b722f