[automerger skipped] fix att notification crash am: 3d2e52b10d
am: 7b9c3ae9f7 -s ours
am skip reason: change_id I39a9a445bbab737b79f966b3e48c0b24a36f5e18 with SHA1 251ce8fd44 is in history

Change-Id: Iadee55c620fb7507b45bd9273c0a8f59c1446718