[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: 50ec2c21 skipped: ed126b5d skipped: 0b52ca46 am: 65294e6e -s ours
am: c808f15c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacb is in history

Change-Id: Ia806284e60b86d6d942de73a98d8ef3b48cd6847