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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into rvc-dev am: 0e5e1569 am: e7de5cde -s ours am: 28ba78de -s ours am: 1ce08c67 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia54f1b7176af5d0ebbf82f1322e45637fb72682f