[automerger skipped] Do not allow draw on top for App notification settings...

[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d932857 skipped: e537ffec skipped: 8f70c24f skipped: 188904e6 skipped: ceb1ed0a am: bfe5b37b -s ours am: 530fa8b2 -s ours
am: 20b5a01f -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacb is in history

Change-Id: I656e7e0fac7c63c55f82bfc01183e69adfe2164b