[automerger skipped] Merge "Do not allow draw on top for App notification...
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2
am: fd058ab8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 e4800786 is in history
Change-Id: I7fbd29f4d72fda672e986f12d17e37bee1b89e4b