[automerger skipped] Merge changes from topic "toast-security-fix-sc-dev" into...

[automerger skipped] Merge changes from topic "toast-security-fix-sc-dev" into sc-dev am: 4c3009bf am: 18a6f9ee -s ours am: 44302bcb -s ours

am skip reason: Merged-In Ibce11ee7df5b5c8c226ebfab29574a99cd656f6d with SHA-1 fb06059f is already in history

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

Change-Id: Id14b9ad692b6fd3d2e59451bba491563c8c0d2de