[automerger skipped] Merge "Crash app on foreground service notification error." am: 036ea39d96 am: ebf0ccf2dc am: 7dc7622d5f
am: 5d46ef370e -s ours
am skip reason: change_id I94d9de50bb03c33666471e3dbd9c721e9278f7cb with SHA1 9fbc5e75b4 is in history

Change-Id: I009810173398521c1973741daa3c2f9a4538dde2