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

Change-Id: I1a5227631dbc4446af520c71e9d23b54bec5085f