tree e43e4fc7e84f60986229bcf800676f141241738e
parent 8c612b1334d08ac14324da6e353af433af995fd6
parent 65294e6ee5c943aec57da88314ff1a9c52271ecd
author TreeHugger Robot <treehugger-gerrit@google.com> 1559725351 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1559725351 +0000

Merge changes from topic "security_fix_settings" into oc-dev

* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e
  Do not allow draw on top for App notification settings