[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e

Change-Id: Id4e7e996a34a5520a3785e2e778e75b4ee02ed02