[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev am: b95361ab60 -s ours
am: 8837b15f78 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a51f is in history

Change-Id: Iaee4509328c45e5405edc1bae475d2e1cf5f4ba7