[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-mr1-dev am: b95361ab -s ours am: 8837b15f -s ours am: 93aed562 -s ours
am: 3e6af308 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 fe86a2a5 is in history

Change-Id: Ib69f2398c7489eb48583a37c38f8341680ab3096