[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: 04208f16 am: 6dbb3108 -s ours am: 59348982 -s ours am: d20d75c3 -s ours am: 971190b0 -s ours am: ab2ad075 -s ours
am: 05b744c5 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacb is in history

Change-Id: I25038a31fadc86c57c34ec809c2716f4caca1bbb