Merge changes from topic "toast-security-fix-sc-dev" into sc-dev am: 4c3009bfb6

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

Change-Id: I502ee5edbfa791ad7028309755236f65c036c127