[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: 3fb59338 -s ours am: 08672ec7 -s ours am: dd7de36b -s ours
am: c3740704 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a5 is in history

Change-Id: I8d254e69b173955f2b4c2aeee5d59268bac817e3