[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: 799f0a7f am: 97e9e5f4 am: 563893b2 -s ours am: fe21853a -s ours

am skip reason: Merged-In I316b76b685ca5030fd8aa91283555efcce4d6994 with SHA-1 3b8aa02b is already in history

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

Change-Id: Iba5d4214841d7769e24c8a553e310e71481a6e35