Merge changes from topic "cherrypick-cherrypick-sawRevoke-drldh0k6wy-6ocmw7r6v8" into sc-qpr1-dev

* changes:
  [automerge] RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 2p: 5e80fcf8c4
  RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23