[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into sc-dev am: 5cf8597a am: a03eeb96 -s ours am: 1b6154a3 -s ours am: e626fab7 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16743243

Change-Id: I7a9c2c63217c4bcddc9aab5d2ac678f3a069f1fa