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

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

Change-Id: I4ae3bd9d8bffe28a3e8d10ba17200d87b34ab32d