Merge "Set intent flags for notifying messaging app." into oc-mr1-dev am: 6b5d963a56
am: 72bc1128ba

Change-Id: I502806b50f6d845cbbc1c31fb7a53f7478b62a55