[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
am: 65294e6ee5 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I02047207e9ed30afb0afb003f0c93f2cfb59addd