[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-v2-dev am: 103efafe am: 79120c92 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I272890501cacb81eedf9c399e8af02e1b189b064