Merge changes from topic "am-7e9372ebcbec48df8185598aa79c5433" into qt-r1-dev-plus-aosp

* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c21 skipped: ed126b5d skipped: 0b52ca46 am: 65294e6e -s ours am: c808f15c -s ours am: 0b36c5e9 -s ours am: e7c29888 -s ours am: ca593c20 -s ours am: 7d3edc88 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacb is in history
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d932857 skipped: e537ffec skipped: 8f70c24f skipped: 188904e6 skipped: ceb1ed0a am: bfe5b37b -s ours am: 530fa8b2 -s ours am: 20b5a01f -s ours am: 2d387349 -s ours am: f7cd796e -s ours am: 152f4c83 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacb is in history
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16 am: 6dbb3108 -s ours am: 59348982 -s ours am: d20d75c3 -s ours am: 971190b0 -s ours am: ab2ad075 -s ours am: 05b744c5 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacb is in history