Revert "Crash app on foreground service notification error."

This reverts commit d1a8aade.

The change was originally picked from aosp master. It is corrected much
more throughly by the backported fix in
I94d9de50bb03c33666471e3dbd9c721e9278f7cb

Change-Id: I4a149ce06d4e6275f7da266f6f85836c1a93f902