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

Change-Id: I4056aad58fec994327309c1e4bd28aa3e193a1c1