Revert "Only extract RON content model for RON style notifications."

This reverts commit 3a0c87599fe82f7e44f833069fa9a3ecbc83783f.

Reason for revert: Notification.java should be RON agnostic.

Change-Id: Iaf35494145eb65ad4ce7d7ebf68110766697e60c