[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev
am: b95361ab -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b is in history
Change-Id: I66e6f4f24bd7349db363f28f0462d16825e544c8