[automerger skipped] fix att notification crash am: 3d2e52b10d -s ours am: 80895ba0ee -s ours
am: b94c25fcec -s ours
am skip reason: change_id I39a9a445bbab737b79f966b3e48c0b24a36f5e18 with SHA1 3d2e52b10d is in history

Change-Id: Id441b285a45afeb9a07f01abbc4cecd854626a17