[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96

Change-Id: I6f8236a1de4c8edc766ae625fe0010924e4cfba3